Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17544892



Change-Id: I5c9d2124fff45b80d4c0c701f589b7fbd685ac59
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>