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