Merge "Set min_sdk_version to be part of mainline modules" am: ee959e950b am: b78c851de4

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1323982

Change-Id: Ifff8af337a075422e479c90af179856f8f2ac15a