Merge "Fix policy engine serialisation" into udc-dev am: 59908249 am: 33b36cf2

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



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