Merge "Move tablet resources to product overlay folder" into tm-qpr-dev am:...

Merge "Move tablet resources to product overlay folder" into tm-qpr-dev am: 27d53afa am: 420cc911 am: 962a3932

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21472866



Change-Id: Ib6c0bdc168410c61cd83c7052a549fd207168de6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>