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