Merge "Apply pending AppInfo on Activity override change" into sc-dev am: d2dd630204

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

Change-Id: I65f9630fe8c10ed833292cb1c609cacac3fcf343