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

am skip reason: subject contains skip directive

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

Change-Id: Ife41dd7f4ae455ebfa37e91f2ef44e699839eb0e