am skip reason: Merged-In I7a7830cb8875d74a447b3ee07105899418a084c4 with SHA-1 1a31b9df is already in history

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



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