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