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