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