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