Merge "DO NOT MERGE: Remove AppSearch from Android R." into rvc-dev am: 8caff7dc am: 787c3e83 am: eeb047d4 Change-Id: I5df3b7b02914878ef4aa617ff85554e7a6f549cb