Merge "Reset min_sdk_version of libmedia_jni" am: 0afaa9d9f6 am: 80ff97c8a5

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

Change-Id: I9e37f8f478b3e08c1ca68296ce733035fd0f0009