Merge changes from topic "nnapi_test_dynamic_reg" am: 6568622209 am: 0ac1896ef5 am: 2bfcfe37a9
am: 0e8c242bf0

Change-Id: Ib27bccaae366eb5b5203a3349e9852a94ada2554