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