Merge "Shutdown secondary SAP automatically" into udc-d1-dev am: 57522f0f...

Merge "Shutdown secondary SAP automatically" into udc-d1-dev am: 57522f0f am: 2f87be66 am: 12451957

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23680143



Change-Id: I4cc7f0f4501f33fb1a554a60523b16ec04207a2c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>