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

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

Change-Id: I45dc86b796a22957bb0489d70a812d6b2d488e07