Merge "Merge "[Passpoint] Clean up exception messages in PpsMoParser" into...

Merge "Merge "[Passpoint] Clean up exception messages in PpsMoParser" into rvc-dev am: 0fcf6ff4 am: 07dbffad" into rvc-d1-dev-plus-aosp am: f55ddc2e am: 08d5d0ee

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

Change-Id: Ie70366915218238d9675d9f4b9b286ae1d00b446