Merge tag 'android-7.1.2_r4' into 7.x

Android 7.1.2 Release 4 (N2G47H)

Conflicts:
	res/values-el/test_strings.xml
	src/com/android/bluetooth/btservice/RemoteDevices.java