Merge "Merge "Give hidden API behavior to legacy apps." into rvc-dev am: a7a96ad6f8 am: 314eb8f16b" into rvc-d1-dev-plus-aosp am: 059370c6f9 am: d0db148bcd

Change-Id: I039fc6b9674fb31ac5733daf95a1157b58921d3b