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