Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21339549 Change-Id: If4cfdeb37dbcc49ce9ec36bee690df4db1a87213 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>