[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: f845ff5d -s ours am: ef66776a -s ours am: 2bb6480d -s ours am: 195621f4 -s ours

am skip reason: skipped by user alexbuy

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

Change-Id: Iec74ab2954763b5e4171c8b98acd7e36131c0290