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