Merge "Make Display.Mode.isSynthetic TestApi" into aosp-main-future