[automerger skipped] Merge "Don't restore nfc qs tile if it is not in the...

[automerger skipped] Merge "Don't restore nfc qs tile if it is not in the stock" into sc-dev am: 19c6e42b am: 4c9601f7 -s ours

am skip reason: Change-Id I2863d365aff9a3fe6afe1cb0915dd076bf543cd3 with SHA-1 173e49eb is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id2cb5987e4d6e7d52c0cb09aa5807124deed12af