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