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