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

[automerger skipped] Merge "Always restart apps if base.apk gets updated." into qt-dev am: 1adea76f am: 972089ad -s ours am: 9cc48f64 -s ours am: 92bc1bf5 -s ours am: a683c9b0 -s ours am: 9b433a43 -s ours

am skip reason: skipped by user alexbuy

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

Change-Id: I6d6b50b51cbf145f491a75e0481cd0f8acad5839