[automerger skipped] Merge "frameworks/base/wifi: Move migration_samples to non-updatable directory" am: eff887b714 am: 7f1d2693f0 am: b3eb55e432 -s ours
am skip reason: Change-Id Ia95e300da9286d79ee57c285c3bfa88ecc98e326 with SHA-1 e7cc3ae663 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1533146
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If73ddfb193f3e9970d2626ddf9412fcc832f436f
This commit is contained in: