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