Merge "Merge "Fix IME visibility after lock screen" into rvc-dev am:...
Merge "Merge "Fix IME visibility after lock screen" into rvc-dev am: fcaa5a86 am: 9ff3623a" into rvc-d1-dev-plus-aosp am: 7211f78f
Change-Id: I55f5c67f4b944c6061bc7861f4017101ffbfde3a