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