[automerger skipped] Merge "[NS04] Introduce Network Offers and their callbacks" am: d603e40fa5 am: 06e72bc268 am: b90fb723bd -s ours am: 8ad336f4b1 -s ours
am skip reason: Merged-In Idec1fe8eb4ac6f562bf098e3dd470f11024d04f2 with SHA-1 1ef1d90ee0 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556102
Change-Id: Ia6541252cb119d5fd9279e58c2af0336bf047b02
This commit is contained in: