[automerger skipped] Merge changes I0d002ea4,Id0fd2491 into tm-d1-dev am: 900509b7 -s ours

am skip reason: Merged-In I0d002ea46de4474fcf863f142f2ee17fe3a5c742 with SHA-1 a20990ec is already in history

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



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