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