[automerger skipped] Merge "Merge "Update conditions for updates without user...

[automerger skipped] Merge "Merge "Update conditions for updates without user action for Android T" into tm-dev" into tm-dev am: 83f718f8 -s ours

am skip reason: Merged-In Iafd03b75ecf246a9651572becf6158316ecd8100 with SHA-1 5e1705c5 is already in history

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



Change-Id: I3de22ac70ca32438b8140a93a136d612d4226e32
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>