[automerger skipped] Merge "Explicitly reference framework-wifi app build rule" am: c29f606cc7 am: adedc24110 am: 441eb20b82 am: ab60a44383 am: 7276864ed9 -s ours

am skip reason: Change-Id I3d9f2049cf898b5e551a5c5764df423abaa5e92d with SHA-1 20dd58aa8d is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1448635

Change-Id: If3a0e1416ee61dc030048fc6e0a61d38ef5f4384
tree: 94b5b093d27304085e8f2484a905d72261cecc13
  1. Tethering/