Merge "Show hidden API warning once per process" am: 880839d2d1
am: 169a159207

Change-Id: I11b174f82b8a71884de6b384f9478d125ce45ab4