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

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

Change-Id: I793ab1a84edc7f71434378f364960332761c33c9