Merge changes I49d32c18,I8e8736fc into tm-dev am: d338520c

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



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