[automerger skipped] [DO NOT MERGE] Address the Smartspace UI templates APIs review comments. am: 36376d66 am: e3ba5229 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I5ad69ccc4a267cc563db505b4ada8ba1147facb8