[automerger skipped] Merge "Explicitly reference framework-wifi app build rule" am: c29f606c am: 70defe1c am: 2756147f am: d02f5819 am: 80344cf6 -s ours

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

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

Change-Id: If3a0e1416ee61dc030048fc6e0a61d38ef5f4384