OpenJDK 11: Add missing code under change markers for OpenJDK 8

This CL adds missing code from 8u121-b13 under change markers to
minimize the upstream diff in preparation for OpenJDK 11
integration.

Bug: 202962059
Test: m droid
Change-Id: Ic6b877866f48a4707d5d99fa5391be95a3675cb3
1 file changed