[automerger skipped] Merge "Stabilize hidden API lists" into pi-dev am: 80167ec0c7  -s ours
am: 5ad3515212  -s ours

Change-Id: Iae48ccab36ab493cfea35c7817ba9da9a000c5d1