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

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

Change-Id: I165d32d1bc7191103d767816deec9c9de4b00032