Merge "Add new 'explicit GC' policy to StrictMode."
am: 121eb58ab4

Change-Id: Ice5b3c97fb7a791b2623df8e2de6c2669b920b19