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