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