Merge "Capture secure layers for edge extension" into tm-qpr-dev am: 96c49780

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



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