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