Merge changes from topic "am-5bba1c3979e84d63b77d19ae41de4080" into android11-tests-dev

* changes:
  Merge changes from topic "am-71cfdf05bda449c2bf368d00a6ebd815" into android10-tests-dev am: 3f595146f8
  [automerger skipped] Merge "DO NOT MERGE: fingerprint: Fix BuildFingerprint" into pie-cts-dev am: 36c35bf759 -s ours am: b9c646df50 -s ours