Merge "Merge "[ScreenLock] Use requested quality for encryption popup" into nyc-dev am: 102b368172 am: 1bc12ee9c2" into nyc-mr1-dev-plus-aosp
am: 544b4f9043
* commit '544b4f90436e8903dfd814194d7832002ecf88e1':
Change-Id: Ie4c6dec11436d92ee14dafff31dfd86818f56ce6
This commit is contained in: