Merge "Cleanup AcitivityManagerConstants and AppSearch" into sc-dev am: 4ee37c673f am: f33d439ecf

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15191320

Change-Id: I0318ae6a155d7aedac0a1c9e37e389af7e40afeb