Merge "Make yield-to-bad-wifi behavior backward compatible with R" into sc-dev am: 544e4241 am: d1b0a86a

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

Change-Id: I97c89b6e5879f468955eb7801b182ff5f8ca12e4