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