Merge "Do not relaunch bg activities when application info changes" into...

Merge "Do not relaunch bg activities when application info changes" into sc-dev am: 3100c1e4 am: d8e1824c am: f1044515

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

Change-Id: I91042051276abf894b3889194e9c33c68f861834