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

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



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