Merge "Replace assert with assertTrue in CleanupTest" am: b99bfb8aae

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

Change-Id: I411e50d062fe1c90406a700550fc6a454c402929
tree: ce55eddf6934d257469933c7686575c0f738ecaf
  1. staticlibs/