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

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



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