Merge "Merge "Update conditions for updates without user action for Android T"...

Merge "Merge "Update conditions for updates without user action for Android T" into tm-dev" into tm-dev am: 83f718f8

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



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