[automerger skipped] Merge "Import TLS handshake atom for Conscrypt" am:...

[automerger skipped] Merge "Import TLS handshake atom for Conscrypt" am: 97f35bbb am: bce02088 am: d5cad5b3 am: c2714908 -s ours

am skip reason: Change-Id I142a792c34dced6b0e27b867ed3a1d95249a5f7f with SHA-1 98656eef is in history

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

Change-Id: I4cc60ffc7e8fa7bf67154f72c1433edd345d8cc4