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