[automerger skipped] Merge "Replace "apex_inherit" min_sdk_version" am:...

[automerger skipped] Merge "Replace "apex_inherit" min_sdk_version" am: 94cc82cf am: f82ea3b0 am: d38f609c -s ours

am skip reason: Merged-In Ie6984128e6b84ba73de3f4c08eca5560657c5ca2 with SHA-1 ab9b5df4 is already in history

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2365248



Change-Id: I2454224f86d3850951d0952d9ad03b109e9a6a67
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>