Merge "bools: fix use_lock_pattern_drawable javadoc. am: c4046b5542 am: f36beac956" into nyc-mr2-dev-plus-aosp
am: 66602c8885

Change-Id: Icf9930719382684fac096923e1fa490225d4ee55