Merge "Update lynx SVN to 15 am: 298ba980a2 am: 721bf2d648 am: a560c0a552" into udc-qpr-dev-plus-aosp am: c4d8a61b3a

Original change: https://googleplex-android-review.googlesource.com/c/device/google/lynx/+/24392319

Change-Id: Ib1d5e0ced31ee3641787802ff803bcc4a0b7daf4
Signed-off-by: Automerger Merge Worker <[email protected]>