Merge "[MS14] Move isPersistable to NetworkPolicy" am: f421f1dd68 am: 3c4a90eda1

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

Change-Id: I87ac119e8e44fc03e7fcdf9a1185e5b68436def2