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