Merge "Move conscrypt from the set of non-updatable APIs" into rvc-dev am: 4963e51f97 am: b813e71e8c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11408320 Change-Id: Iee98f74dd5fab19ae96b74f32524585cec5624c2
This commit is contained in: