[automerger skipped] Merge "DO NOT MERGE Allow pinEntry field to be outside pin_container" into sc-v2-dev am: 6bcdf6fa03 am: 399ae54b25 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I6c5f7e9f13eae2c3b56a25432c61a95994244b13