Merge "Fix Settings app crash cause by BadParcelableException" into udc-dev am: 6853b5d733
am: 245759ba42
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22848117 Change-Id: I7508a576d2044aefb6fd4a76ab0ad233d09bed64 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: