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