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

[automerger skipped] Merge "Always restart apps if base.apk gets updated." into sc-v2-dev am: 95819b31 am: fccb9247 -s ours

am skip reason: Merged-In I27a0c5009b2d5f1ea51618b9acfa1e6ccee71296 with SHA-1 b9cc7bc0 is already in history

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

Change-Id: Ia1520f4d497063f4889cad2eac956a4751797481