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