Merge changes from topic "am-612047d859854ab9aefcf7ca10023e1a" into udc-qpr-dev-plus-aosp

* changes:
  [automerger skipped] Merge "Create default PRODUCT_INCLUDE_TAGS in product_config" into tm-qpr-dev am: 8a0ae28e -s ours am: 196f43d4 -s ours am: 77131bc2 -s ours am: 6ab3c510 -s ours
  [automerger skipped] Create default PRODUCT_INCLUDE_TAGS in product_config am: aa9f41a0 -s ours am: 6b8ac9a3 -s ours am: 94cbe2fb -s ours am: 8bdc7e51 -s ours