Merge "Fix some formatting issues in setRequireUserAction" into udc-dev am: 66948922

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21781280



Change-Id: Ie8eecd0e428710bab900452fa32ed88b21a9467c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>