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