Merge "Add default lock wallpaper capability and API am: 5d99d47f39 am: d688617d4f" into nyc-mr1-dev-plus-aosp
am: 6ea9678cfe
* commit '6ea9678cfea8b68b54632ec7ba93b37499a4bd36':
Change-Id: I4f42b087b59a229677afeb956be4917261b1a100
This commit is contained in: