Merge changes from topic "am-02baaf5a9c6341c193ad11a1792752f8" into qt-r1-dev-plus-aosp

* changes:
  [automerger skipped] Sync with upstream 95647bc8: am: 09980abea7 am: 4eef244fcb -s ours am skip reason: change_id I1d9f5fe46aed85a9d374a9e91a0058a193f4cf43 with SHA1 a1ce7ebac9 is in history
  [automerger skipped] preen should work independently with alwaysyes and alwaysno. am: 77d7bbd209 am: 1dfda9dafb -s ours am skip reason: change_id I903e6bd88e23b711153f226b4288fae7d694a7b5 with SHA1 c9568a9ecc is in history