[automerger skipped] Merge "Fixed API review comments on primitive types on...

[automerger skipped] Merge "Fixed API review comments on primitive types on assistant APIs" into tm-dev am: c3c0da44 -s ours

am skip reason: Merged-In I6103fb78ab366b423336e168eaf5e38f8b0401ef with SHA-1 49c74c9b is already in history

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

Change-Id: I88a7d6c59ba41711ede30697e98f5e6a3ae2fc0e