[automerger skipped] Merge "Allow app's targetSDK to overwrite...

[automerger skipped] Merge "Allow app's targetSDK to overwrite SELINUX_LATEST_CHANGES SDK" am: 32d03133 am: 1a482e6b am: 54592ead am: fef87a60 -s ours

am skip reason: Merged-In Iee40e5ffd677038157ab7349a38eb34934458e25 with SHA-1 bedbb890 is already in history

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

Change-Id: Ic080185b97a96f9583cffad2387d1304862410b2