Merge "Merge "Remove DERInteger usages" am: 1835a248 am: 07e62d76 am:...

Merge "Merge "Remove DERInteger usages" am: 1835a248 am: 07e62d76 am: 96bdc2d7 am: a96a45be" into rvc-qpr-dev-plus-aosp am: a4eb2e22

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

Change-Id: I095ed2a27b4d483d1a64e2d1da0b5a2813e8e806