[automerger skipped] Merge "DO NOT MERGE Allow pinEntry field to be outside pin_container" into sc-v2-dev am: 6bcdf6fa am: 399ae54b -s ours am: 1afc1f40 -s ours am: f0a427e3 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I2cd2632f058d8e76f780bb0099476c77a475a96f