am skip reason: Merged-In If9b602a12b372b20f398583aba06f29ea7aa6e5e with SHA-1 ddaea64c is already in history

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



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