[automerger skipped] Merge "Always restart apps if base.apk gets updated." into qt-dev am: 1adea76f46 am: 972089ad30 -s ours am: 9cc48f64f0 -s ours

am skip reason: skipped by user alexbuy

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

Change-Id: Ida01ae8138ab93aa2fad64c82ccd87ee1078b4ab