Merge "Add protection for the BadParcelableException" into udc-dev am: 54f39ec271
am: 6a54517f05
am: a316530fd5
am: 7812daefef
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23279576 Change-Id: I2ff1de4d3163106db38121cf6952a421eee675f5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: