Merge "Revert "Add a test for ParseException"" am: fe737812ce am: f35d4a2d44 am: 44775a141e

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

Change-Id: I9257db040086870412833e8cfb14596f6ac17288