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

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

Change-Id: I816fd36fa0d0499b41a52fbc45052486c83fb951