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