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