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