[automerger skipped] Merge "Reset target sdk version of ParseTypeImpl" into...

[automerger skipped] Merge "Reset target sdk version of ParseTypeImpl" into sc-dev am: 17eb3ba0 -s ours

am skip reason: Merged-In Ie6fbc4b79e94943c9282206b1ef6d20b4129fa0b with SHA-1 2cd9d261 is already in history

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

Change-Id: I4a9ed006947a6056a9ba74cd7a9515ad8ce00c21