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