Merge "Don't load app restriction from saved files in test" into tm-dev am:...

Merge "Don't load app restriction from saved files in test" into tm-dev am: a496007d am: ceff460f am: a4f04297

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



Change-Id: I84bad5a399ecc18c6874abf0f6b6602c6e505b98
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>