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