Merge "Test hidden API dark grey & pre-P vs P" into pi-dev
am: de712beb1c

Change-Id: If103c3f1b454dc6169fb9f98a474b065653bf7a4