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