Merge "Save the Bluetooth and Wifi state in Persistent Memory" into udc-dev...

Merge "Save the Bluetooth and Wifi state in Persistent Memory" into udc-dev am: 57fb7048 am: cdeb6e56

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/21947240



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