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

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

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



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