[automerger skipped] Merge "[NS04] Introduce Network Offers and their...

[automerger skipped] Merge "[NS04] Introduce Network Offers and their callbacks" am: daffcf97 am: f3249af8 am: f2888021 -s ours

am skip reason: Merged-In Idec1fe8eb4ac6f562bf098e3dd470f11024d04f2 with SHA-1 40a95a5a is already in history

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

Change-Id: Idf45cf2f62c4ba2182f00ae2f05c150e0fdb6d21