Merge "Roll forward: add a test for ParseException" am: 1f43a69d91 am: 80deff6a5c am: 890dbd1205

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1679759

Change-Id: I7b1b1be4fa5bcda94b653dffbc99db65384079ad