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