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

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

Change-Id: I63c4ad39ed92947aa925e5936a4d1f22669f00a1