am 0090082e: resolved conflicts for merge of 89a086c1 to klp-modular-dev

* commit '0090082ed040dd3ea897cf13d7e837dadd06ca3f':
  Use hidden API to validate APK chains