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