[automerger skipped] Merge Android R am: e3418ae93e -s ours

am skip reason: Change-Id Ibe2b21465c2e62400f72bbb488944a7a641a91ee with SHA-1 cbf46917af is in history

Original change: https://android-review.googlesource.com/c/platform/system/incremental_delivery/+/1422344

Change-Id: I74d7c08e82377492b5f6f387bcbe3628ed55f3cf
tree: 33f4e5900bba51ec18cd919936b40581b0bab33c
  1. incfs/
  2. libdataloader/
  3. sysprop/
  4. .clang-format
  5. PREUPLOAD.cfg