Merge "Explicitly reference framework-wifi app build rule" am: c29f606cc7 am: 70defe1cdb am: 2756147fc0 am: d02f58190e

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

Change-Id: Ifc3da9d4b1aa7699a5d3cb36e32d0f58c3062957