Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19751503 Change-Id: Ia0c72608f4c2af7a7309aa0353a223d78376030c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>