[automerger skipped] Merge "Disable XOM on libraries for apps with...
[automerger skipped] Merge "Disable XOM on libraries for apps with targetSdkVerison<Q" am: e7b20fba
am: 255db3ee -s ours
am skip reason: change_id I90b5c91923c8008ae4b4818985842fe3e354a850 with SHA1 739c0b51 is in history
Change-Id: I5730851fc349e97fd88ec7839c075d573f8ac3e9