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