[automerger skipped] Merge changes from topic "nnapi_test_dynamic_reg" am: 6568622209 am: 0ac1896ef5 am: 2bfcfe37a9 am: 0e8c242bf0
am: e6aabcd0e0 -s ours
am skip reason: change_id I0129378c87637b33bb145ec93307634273a9d2fd with SHA1 cbfa6b998e is in history

Change-Id: Ifbf6d666ec7b918f7dd4bb8540809e9a5d80d154