Merge "Merge "Properly handle rotation in NotificationLockscreenPreference" into nyc-dev am: 820d7c85c7 am: c14a9af008" into nyc-mr1-dev-plus-aosp
am: 85a16e6ca9

* commit '85a16e6ca9900c48dd3a6588230c418bc8b2cb9b':

Change-Id: I6795f46dd3496555efd3120d11c96a68f6e0dd29