Merge "Add home/lock screen argument to remaining methods that require one"...

Merge "Add home/lock screen argument to remaining methods that require one" into tm-qpr-dev am: 56a0d719 am: ee0a3518

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



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