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

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

Change-Id: Ic74bb04894e5c6eec61704976b40a7eab4ccee26