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