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

am skip reason: skipped by user alexbuy

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

Change-Id: I164a1737563abdfe143ef461d94362c1e43981bd