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