Merge changes from topic "am-648ebe5686134a31a84e885529cbbfca" into android10-tests-dev

* changes:
  [automerger skipped] Merge "[DO NOT MERGE] Ignore AKISerialNumberTest in cts 9" into pie-cts-dev am: 0879cc86cf -s ours
  [automerger skipped] [DO NOT MERGE] Ignore AKISerialNumberTest in cts 9 am: ed3fe2c126 -s ours