[automerger skipped] Merge "[DO NOT MERGE] Address the Smartspace UI templates APIs review comments." into tm-dev am: 77f82a27 am: 3c8effd2 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Id64b5baccb79e2955a275b92e44cdb6b8cbe14fb