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