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

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

Change-Id: I91924b2ae17a40be74f0ddc770089b5eabd2e1fc