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

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

Change-Id: I6c33a8171b1a39a989ba342aece311bbe00ae426