Merge "Fix double call to ScreenshotController" into tm-qpr-dev am: b49f4114 am: 430e5706

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



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