Merge changes from topic "revert-17607211-aosp_tablet_tune-LBHOYHXCMR" into tm-mainline-prod

* changes:
  [automerge] Revert "Making tablet grid scalable and tuning size" 2p: 4ea95b7fd8
  Revert "Making tablet grid scalable and tuning size"