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