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