[automerger skipped] Merge "Always restart apps if base.apk gets updated."...

[automerger skipped] Merge "Always restart apps if base.apk gets updated." into rvc-dev am: fe30ac3f am: f8bc3f97 -s ours

am skip reason: skipped by user alexbuy

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

Change-Id: I924d77a8e07ad6e1da2328984c6e530ff1cd2ed3