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