Merge "DO NOT MERGE Fix bug when pressing the add user cancel button results in a black screen Test: Tested on Mojave Bug: 80187163 Change-Id: Ie46c228dea9de71b97a276f7e4f2d60fe98649b6" into pi-dev
am: 4a0371bb88

Change-Id: I4bd8bdc43acd456120335992c2d334f380022d82