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