Merge "Add a test for ParseException" am: dfb51531e6 am: 3a21c84b20

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

Change-Id: I17a061ba6395b03250bca4162efe2d439113e1e6