Merge "Add a test for ParseException" am: 68090c1373 am: ae15a30cf0 am: cbdfe0587e

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

Change-Id: I303ef3cdfaddf6b7a4aea661dbbceb7ab8d3eeca