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