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

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

am skip reason: Merged-In Ie6fbc4b79e94943c9282206b1ef6d20b4129fa0b with SHA-1 177a7200 is already in history

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

Change-Id: I8036dc5717a783451812e3d773d8ffa2e9c78ca1