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