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