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