Merge "[Condition] Subscription Introduction" into tm-qpr-dev am: 1f784a05 am: 4eb984ad

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



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