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