Merge "Add assertNoCallbackThat" am: 5d39cb6ea7 am: 302ee01797

Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/net/+/1765527

Change-Id: Ia6dfe0d043a30df97b6bf3ae696503305e5e491f
tree: 9743620c4ece228fa56de4e76a4e6e779bb2fee5
  1. staticlibs/