[automerger skipped] Merge "Add flagging libraries for trade-in mode." into main am: 8639b7d3 am: 3ee0bd96 -s ours

am skip reason: Merged-In Ie6db1e093ee4fc0aa4b01bd4e0639a0ceac50e5a with SHA-1 8691bd4d is already in history

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



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