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