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