Merge "Update javadoc for setLaunchDisplayId am: 334190f26e am: c37e102250 am: 14c9e48273" into rvc-qpr-dev-plus-aosp am: aee490a131

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

Change-Id: Ia989049f1db05cbdca9acdb9cec37970a733a666