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