[automerger skipped] Merge "Disable XOM on libraries for apps with targetSdkVerison<Q" am: e7b20fbae9 am: 255db3ee0c -s ours
am:42b9b27245-s ours am skip reason: change_id I90b5c91923c8008ae4b4818985842fe3e354a850 with SHA1739c0b5193is in history Change-Id: Ica44896e3a3668e393f61182a4c721c61b65785a
This commit is contained in: