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