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: I18b4f561e1483bc0bfdce68a1b647252813908bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>