Merge "Cleanup AcitivityManagerConstants and AppSearch" into sc-dev am: 4ee37c673f am: 8bfd25c64f am: 5a197581be

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

Change-Id: I56bfc01cc278bba417ffc183d7f36d40e26a5cab