Merge "resolve merge conflicts of a99ce55f to...

Merge "resolve merge conflicts of a99ce55f to tm-qpr-dev-plus-aosp" into tm-qpr-dev-plus-aosp am: e652ead3

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



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