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