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

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

Change-Id: Id33d1919f41d3f2d066f9548803d62bf2b461c4f