Merge changes from topic "cmd_user_refactoring" into tm-dev am: d406f1f7

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

Change-Id: I3bf95d8d7d0dccf9d5a56317b0cacbda0f48a2b5