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

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

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