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