[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: bba42fa963 -s ours am: 7bf4a5ef22 -s ours am: 3accde9217 -s ours am: 36af1b6a88 -s ours

am skip reason: Merged-In I4f860481c48bb70e594d91a4b6eea5d111c35c5f with SHA-1 18c0660929 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/libs/modules-utils/+/15571759

Change-Id: I07356e70ef8b04843c4c0374873e355a180d147c
tree: 50073577578cd28faae6341f11abe4f2e4ba64d3
  1. build/
  2. java/
  3. javatests/
  4. tools/
  5. Android.bp
  6. OWNERS
  7. PREUPLOAD.cfg
  8. TEST_MAPPING