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