Merge remote-tracking branch 'aosp/android-4.9-q' into int/11/fp3

Linux 4.9.311

Change-Id: Icc857c15ef9ecca108c547f153f4987a75324a0c