[automerger skipped] Merge "Remove libcrypto dependency when building com.android.media" am: 853ef5c87d am: 1e1bc0abfa -s ours am: 59db65fba7 -s ours am: 85badef368 -s ours am: 096c68661f -s ours

am skip reason: Change-Id Idbd6b4bc3a9f7edc63bf5b450d02182032be37b2 with SHA-1 f11c67768c is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1336079

Change-Id: I61b3bcaee111a0750b927da59356dd9ed45a9d44