Merge "Correct AdditionPerfTest to return void." am: 4e7f5518f1

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2059947

Change-Id: I61ac0fdf471ae9f00a30a02b13848879144b7b06
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>