[automerger skipped] Merge "NNAPI VTS: use max time point instead of uint64_t max" am: 775fe5c617 am: 0040a2cdc5 -s ours am: cd4b9d270a -s ours am: 7c965b3d25 -s ours am: 445d8f466a -s ours
am skip reason: Change-Id Ic74f83242cbe04a4cec47adbfc51002fdf8bb47d with SHA-1 79d6bb1ad2 is in history

Change-Id: If055259bc569fb4ca8cb97d946bb6cb440ca53c9