Merge "Add protection for the BadParcelableException" into udc-dev am: 54f39ec271

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23279576

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