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