Merge "bools: fix use_lock_pattern_drawable javadoc. am: c4046b55 am: f36beac9" into nyc-mr2-dev-plus-aosp