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