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

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



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