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

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

Change-Id: Ie86bf592435383da29eb8b53590d1e208ffd0a2b