Merge "Update javadoc for setLaunchDisplayId am: 334190f2 am: c37e1022 am:...

Merge "Update javadoc for setLaunchDisplayId am: 334190f2 am: c37e1022 am: 14c9e482" into rvc-qpr-dev-plus-aosp am: aee490a1

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

Change-Id: Ia989049f1db05cbdca9acdb9cec37970a733a666