Merge "Framework: Prefer android.system.Os over libcore.io.Libcore.os" am: 5f04db96b3
am: 07efe116b1

Change-Id: I1c9f25ea1ac00037cc90dfe4c8c2552f90a33ecd