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



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