[automerger skipped] Merge "Move conscrypt related hidden API flag file...

[automerger skipped] Merge "Move conscrypt related hidden API flag file contents" into sc-dev am: d8f06220 -s ours am: 2922d4c2 -s ours

am skip reason: Merged-In I8dcc23b8123087cada42646f181d5409fba9eb35 with SHA-1 f7c02ed0 is already in history

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

Change-Id: I5152c0cd509e630880093c0926b799076b592129