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