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



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