Merge "Merge "Merge changes from topic "presubmit-am-309bd698bce64ba688b2d3e351e12ef1" into tm-qpr-dev-plus-aosp am: 9617844c" into udc-dev-plus-aosp am: 1213ada8 am: d1728575" into udc-qpr-dev-plus-aosp am: b61bf633

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



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