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