[automerger skipped] Merge changes Ie8ddf1db,Ice6de114 into tm-dev am: edb497c9bf -s ours am: c26af50021 -s ours

am skip reason: Merged-In Ie8ddf1dbaaf1ba607657646db05d3eb622fc9415 with SHA-1 7f387f9ae9 is already in history

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

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