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