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