Merge changes from topic "am-17b06408381142599579982fd9ff2382" into tm-qpr-dev-plus-aosp

* changes:
  [automerger skipped] Merge "Merge "Restrict the smallest screen width dp of an embedded TF" into tm-dev am: e107722e am: 6bbb0bf8" into tm-d1-dev-plus-aosp am: b8872fe7 -s ours
  [automerger skipped] Merge "Restrict the smallest screen width dp of an embedded TF" into tm-dev am: e107722e am: 6bbb0bf8 am: 6989cabf -s ours