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

Change-Id: I655be3bcd7d3f4fee796d08bdeb380d28f83e097