[automerger skipped] Merge "Always restart apps if base.apk gets updated." into rvc-dev am: fe30ac3f am: f8bc3f97 -s ours am: 7190fb72 -s ours am: 44955ce9 -s ours am: af74a2e5 -s ours am: 744b8a7a -s ours

am skip reason: skipped by user alexbuy

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

Change-Id: Ie42688d2937b0b7650e6d283274fa1a949b15ce2